Fix some parameter name mismatches to make g-ir-scanner happier

diff --git a/gdk/gdkcontentformats.c b/gdk/gdkcontentformats.c
index d9ca134f21377d2d874566f8ed00f890577539cb..2663a3bbc7bb274b0b296cbacc6659b483a397e0 100644 (file)
--- a/gdk/gdkcontentformats.c
+++ b/gdk/gdkcontentformats.c
@@ -102,7 +102,7 @@ gdk_content_formats_new_take (GType *      gtypes,
  * gdk_content_formats_new:
  * @mime_types: (array length=n_mime_types) (allow-none): Pointer to an
  *   array of mime types
- * @nmime_types: number of entries in @mime_types.
+ * @n_mime_types: number of entries in @mime_types.
  * 
  * Creates a new #GdkContentFormats from an array of mime types.
  *

diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index c328baded4f63eb35bf31185444577f79169b16a..20222259dfd0fc4a3eae8cbf78396803d85ec2f9 100644 (file)
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1854,7 +1854,7 @@ gtk_clipboard_wait_is_uris_available (GtkClipboard *clipboard)
 }
 
 /**
- * gtk_clipboard_wait_for_formats:
+ * gtk_clipboard_wait_for_targets:
  * @clipboard: a #GtkClipboard
  * @formats: (out) (array length=n_formats) (transfer container): location
  *           to store an array of formats. The result stored here must
@@ -2065,7 +2065,6 @@ gtk_clipboard_store_timeout (GtkClipboard *clipboard)
  * @formats: (allow-none): The targets (data formats) in which the
  *    functions can provide the data or %NULL
  *    to indicate that all forms should be stored.
- * @n_formats: number of elements in @formats
  *
  * Hints that the clipboard data should be stored somewhere when the
  * application exits or when gtk_clipboard_store () is called.

diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index ecc49bee10979aa1a9cc2bb2d67786c6e228eaef..0d353a4e3a4932f93b2a1349ddedbe1b9738b01b 100644 (file)
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -262,8 +262,8 @@ GDK_AVAILABLE_IN_ALL
 gchar **          gtk_clipboard_wait_for_uris      (GtkClipboard  *clipboard);
 GDK_AVAILABLE_IN_ALL
 gboolean          gtk_clipboard_wait_for_targets   (GtkClipboard  *clipboard,
-                                                    GdkAtom      **targets,
-                                                    gint          *n_targets);
+                                                    GdkAtom      **formats,
+                                                    gint          *n_formats);
 
 GDK_AVAILABLE_IN_3_94
 cairo_surface_t * gtk_clipboard_wait_for_surface   (GtkClipboard  *clipboard);
@@ -283,7 +283,7 @@ gboolean gtk_clipboard_wait_is_target_available    (GtkClipboard  *clipboard,
 
 GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_set_can_store (GtkClipboard         *clipboard,
-                                  GdkContentFormats    *targets);
+                                  GdkContentFormats    *formats);
 
 GDK_AVAILABLE_IN_ALL
 void gtk_clipboard_store         (GtkClipboard   *clipboard);

diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index b08a8a83ab27490b9d5917828734fb894ff414aa..4038ac3ae9f1b93faf87491478a1c2dfe710640f 100644 (file)
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -62,7 +62,7 @@ void gtk_drag_unhighlight (GtkWidget  *widget);
 
 GDK_AVAILABLE_IN_3_10
 GdkDragContext *gtk_drag_begin_with_coordinates (GtkWidget         *widget,
-                                                 GdkContentFormats *formats,
+                                                 GdkContentFormats *targets,
                                                  GdkDragAction      actions,
                                                  gint               button,
                                                  GdkEvent          *event,

diff --git a/gtk/gtkdragdest.h b/gtk/gtkdragdest.h
index 84a65a5eae012eaf1e3aef9e62066230dabefdaf..d69bd06eec99b998969df17924f1241b9e47ac58 100644 (file)
--- a/gtk/gtkdragdest.h
+++ b/gtk/gtkdragdest.h
@@ -69,7 +69,7 @@ typedef enum {
 GDK_AVAILABLE_IN_ALL
 void gtk_drag_dest_set   (GtkWidget            *widget,
                           GtkDestDefaults       flags,
-                          GdkContentFormats    *formats,
+                          GdkContentFormats    *targets,
                           GdkDragAction         actions);
 
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtkdragsource.h b/gtk/gtkdragsource.h
index 513d7943501186c747b8d0c3f67190a536918762..4fda28fd2c5c82c4db99e07ecbe8c84d3d729653 100644 (file)
--- a/gtk/gtkdragsource.h
+++ b/gtk/gtkdragsource.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 GDK_AVAILABLE_IN_ALL
 void gtk_drag_source_set  (GtkWidget            *widget,
                           GdkModifierType       start_button_mask,
-                          GdkContentFormats    *formats,
+                          GdkContentFormats    *targets,
                           GdkDragAction         actions);
 
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 1ff842cfc4e1f972c59e663f87f3165e9a1794ea..77893911271b5347f5f836c210dae5f5037f2dd0 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -943,7 +943,7 @@ gtk_image_set_from_surface (GtkImage       *image,
 /**
  * gtk_image_set_from_texture:
  * @image: a #GtkImage
- * @surface: (nullable): a #GdkTexture or %NULL
+ * @texture: (nullable): a #GdkTexture or %NULL
  *
  * See gtk_image_new_from_texture() for details.
  * 

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index cd4b213a9f2c28625a3e479c1b7c58eba360f593..da5ed4855e3755e8d1dbc76022bb59fc581aedc0 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -400,7 +400,6 @@ gtk_content_formats_add_image_targets (GdkContentFormats *list,
 /**
  * gtk_content_formats_add_uri_targets:
  * @list: a #GdkContentFormats
- * @info: an ID that will be passed back to the application
  * 
  * Appends the URI targets supported by #GtkSelectionData to
  * the target list. All targets are added with the same @info.

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 5ee12bf91af15066e52eebdfb433162c609b968b..deaa220008b294d980e2823d85178e8df4592aaf 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1238,7 +1238,7 @@ gtk_settings_create_for_display (GdkDisplay *display)
 
 /**
  * gtk_settings_get_for_display:
- * @screen: a #GdkDisplay.
+ * @display: a #GdkDisplay.
  *
  * Gets the #GtkSettings object for @display, creating it if necessary.
  *